fix build and test