Clean up class - moving hardcoded results to mock objects - and adding
javadoc.