Minor tidy of Order and ShopTest
Rearranged some functions and code in OrderProcessor