Temp unit test changes to fix build failure