Modified testing project so that it properly builds.
Merge branch 'development' of https://github.com/yanfoe/YANFOE.v2 into development