Refactored tests to create data on the fly and cache it once created