Add last tests for issue #2

Documentation and a final pass to make sure all the logic is correct to
follow.