Split unit tests into separate files under src/unittest/ Give better unittest diagnostics Clean up some code
