Fix build errors caused by incomplete changes to unit test file