Added some more tests.
Merge branch 'feature/Orders_test' into develop