Start working on test utils for FS