refactored some tests
Fixing badness