added test, fixes #1032
Fixed #1033
Fixed #1034
fixing comments
Merge pull request #1116 from AdamSaleh/template-tests

Added template test, adds operating system, fixes #1032