Fixed old tests.