Found the bug! All tests passing