Keys function added #16.
Refactoring requirements for functions using hamcrest matchers.