Added more tests. More conversion to glob + like