Fixing tests and code.
Fixing OneVisitorTwoVisitsTest.
Fixing more tests.
Fixing more tests.
Fixing more tests.
Fixing most of the tests.