Tidied up the way test data is populated in, more work needed on the subnet calculations, far from perfect