Fix some minor things @goodell noticed
Add some various tests for the --filter method