Added readdir and test