Add tests for #8275
Update one of the Makefiles