Moved tests to their right place