All tests pass and code uncommented

the pending tests have been written and the class code uncommented.