More test code being split and moved etc