Cleanup tests
Remove unused methods