Fix headless content tests and make the previous failure not invisible

r? @jdm