Reorder tests
Fail fast in test if missing arguments