Fix the totally broken instrument_property and add tests for it.