reduced build errors in unit test
unit tests now build and succeed