Added calcTargets tests
Merge Test files