Moved tests, did some other stuff