Features fixed.
Fixed spec examples.
Merge branch 'develop' into fix-tests
Merge branch 'fix-tests' into develop