Slight rewrite of tests, explicitly referring to #1557