fixed tests
bit of cleanup
making more tests