switched to TestNG and removed data from scripts
Merge remote-tracking branch 'origin/master'