Add more tests for GlobIterator and improve patch