Took config and test files from our old code in order to avoid rewriting tedious tests for calcTargets- calcTargets appears to be broken
Added additional files