Relocated remaining tests