Remove debug code from non-master test; test a few more assertions