Updated all tests to get them back to a passing state.