Make tests pass (mark one TODO).
Merge pull request #2 from KakeLP/making-tests-pass

Make tests pass (mark one TODO).