Updated all remaining tests.