SQUASH ME: fixes, rename, and circularity tests
SQUASH ME: test results