Update the FS to reflect latest changes, making tests pass again
Better client.Ctx support for the FS