Cleanup mestachs: adapt test (spacing, shorten notation)