fix build and tests