Fixed and tidied up parameterised testing