Move all remaining tests from tests to specs