Fix #55 - Remove unit test comment, and fix implementation.