Cleaned up the other unit tests, and made hashlist use map()
Formatting cleanup.