incorporates Zach's randomized testing code for v2_2
Merge branch 'master' of https://github.com/jnhnum1/fss