More maintainability and more testcases
Merge branch 'master' of github.com:ssabpisa/oada-test