unit test build fixes