tests issues fixed