Tweaked testcases to remove superfluous parameter names
Refactored and tidied fold tests