#922 Moved the MockFilter to it's own file