Moved Resource matchers to resource package
Updated tests to use new Resource API