Created test template for ErtmsSolutions project
Merge remote-tracking branch 'Upstream/master'