Cleaning up warnings for generics
Updating tests to JUnit 4