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