Used a better Hash function
Updated JUnit tests
Updated JUnit tests