Removed unused bulk code. Added more filter tests.