cleaned up test suite a bit