PM|ST: finish migrating tests