Moved tests, refactored names