More test/swfs unit tests