Fixed: all tests passing!