moving tests to their own directory

and fixing them