Order methods
Fix tests