WIP: APiTesting #1

Closed
akeela_azhar wants to merge 7 commits from APiTesting into master