test suite, naming improvements