Getting rid of errors in tests so I can run the whole suite.