Mark tests with a category as we migrate them. Try to keep the old classes around so that we will be able to use them when testing the compatibility layer.

Always do a first commit to copy the test as is, then change the test in a later commit, to preserve history

This ticket will take a long time to fix, let's create subtasks for it, targeting specific sets of tests.