cleaned up slightly
made hash contents in test more expressive
extract keys method working, but ugly