Fixed all stubs. All tests pass. Added misc equals tests, which also pass