improving tests a bit and adding a test for unmasked with a collection