Avoid package.json warnings
Reorder tests for readability