Moved test data and refactored some tests