2 more tests and reordered params