Fixed OrderTest
Merge branch 'dev-model' of github.com:Farenheight/Lidkoping-SH into dev-model