fixing build and modified tests