Fixing build issues with test