Clean tests, added menu tests