TODO SQUASH ME: fix some incorrect tests
SQUASH ME: improve new test docs, squash with f4aa31728