Refactoring DataHandlerTest to use less code. Now not working because of an SQL error.