move test wrapper into fsWrapper where appropriate