Simplify & slightly extend bug#1959 tests