Unit test cleanup

 - Fix pylint warning
 - Move merge tests to new module
 - Add missing tests
 - Script tests directly using unit test discovery