Fix broken test, and broken test configuration.
Fix broken keys/values methods. Closes #34.