Fixing tests, making sure required parameters come first