Moved tests
Removed dead functions