fix build / tests