Minor fixes
testapi completed, unit tests passed, functional tests not yet passed
functional tests work in local machine