Improved the model filter (allowed the user to specify the test operator...

...)