Refactored and tidied filter tests