Restructured to follow current scheme of Filters, Querys, etc. and expanded tests to test integration