Update SMCFS tests so don't instantiate endpoint (and rename package)
Merge remote-tracking branch 'upstream/master'