Fixed tests that were failing.