rationalise test code
rationalise test code