added filters to resources and client, improved tests to catch a few issues