Remove test that uses the create_resources matcher
Refactor the includes_all_deps matcher a bit