fixed some hasparameters tests
resolved conflict
Working