Added test infrastructure
Merge branch 'develop' into strMap