Prep for next release.
Re-factored the way specific files are filtered. Added new integration tests.