Changing test layout - not sure why classloader models not being found
but this works round it