Reorganise test layout - DONT PULL YET

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