Reorganise test layout

Picked a low hanging fruit - mainly to try the pr builder.