This just eliminates all errors on the tests collection. Elimination of failures is left to the next commit.