Re organizing test class for iteration acceptance testing
Merge origin/master