Removing some stuff...
Moved tests...