unit test - testing fixes