Fix errors that prevent test suite from running.