Alias collect to map and add some tests