Reorder resources
Fix tests