Fix build and test failure