refactor the test suite
remove support file we're not using anymore