revise a test to be clearer
adding a forgotten file
add a missing file for a now-failing test
mergefix