Removing repeated text from bad cut/paste
Restructuring prior to sorting out parametric tests