Merge pull request #6 from Ichoran/master

Added Function/PF testing to sets and maps.
Slightly better coverage for maps.