Update .gitignore to ignore all testData
Compartmentalize code part2

Add helpful suggestions from @nicktuku