Correct class comment
Slight optimisation: break when key is found
Move test class to test directory
Remove unused line