More tests moved over