Changing some test to follow the new way
Fixed some missing params which occured during merge