Updated tests

Separated the 'order' tests so as not to spam system & self