fixes for unit test
fixes for unit test