#464 Add basic support for SWAP devices
#463 fix FS20 test