added order model tests
minor changes
coverage
fixed merge coverage