Moved test data to common area, changed tests accordingly.