Extend the new space and directory tests