Merge pull request #67 from narner/develop

Improved test projects