Unit test update order
Merge branch 'api_refactoring' into develop
Merge branch 'develop'