Fix tests

* Moves files.
* Fix that each file should work alone.