Added initial test methods and changed hashing classes to be static