Test improvements (Set<>)