Added TestFeature1 class
Added TestFeature2 class
Merged test feature1 into master