Refactoring to the test cases. Removed loadOrCreate methods.