test suite refactor: package cleanup