Merge pull request #747 from ZyX-I/more-functional-tests

More functional tests
Merge branch 'kruton-develop' into develop

Fixes #748