uses Hash methods instead of Set ones
minor formatting
moved directory of test case into proper place