WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
You have already defined `expected_block_ref` as  `'HW3'` above. You break the pattern by not using the variable in `.format(`.

Also you assign variables for everything except `block_type`. Is there a reason for that?