Fixed all but four tests that were failing.