Fixing some typos
Fix test command
super fix make test
Merge branch 'develop' into feature/mgmtech/refactor