FIXME: tests to merge after #7783, #7815, #7784