Moved unit tests to make space for performance tests