Changes to modified Redfield code and test modules