tweaked test suite a bit