Finish migrating old tests