Minor fixes to unit tests
New unit test results