Added more tests and refactored test data reader to use new Java 7 try-with-resources statement.