Fix compilation of tests
Move my tests to correct directory
Fix test