This adds tests to ensure that 3b8cd2e36990e695e4cb4b966c8658e7ca1574dc will continue to work in the future.