Split unit tests for changes addressing issue #4.