more tests
more tests
moved some stuff