Changes to allow for querying resources from project API.
some additions to tests