fix build & tests - still WIP