Cleaned up, refactored the creation of test entries into a helper method