Updates and additional tests for issue #2.