Rewrote the tests

Conforming to index convention, removed unnecessary calcTargets() fn in tests.