Integrated FilesystemState into more tests.