Fixed buglets which slipped through in previous commit.
Small test simplification