[FOLD] tests tidying
[FOLD] tests