Added more tests and altered test form

Changed tests to fit JUnit testing pratice,
assertEquals(expected, actual);