Moved "expect" to "filesys"