Failing tests for Selecting Target Locations, plus a few other edits