Merge "Cleanup test (fix comment + make a helper easier to use)"