Add integration test for OrderService class + misc fixes and refactorings.