Add some heredocs

Also delete some unused tests.