refactored tests, model filter fixes.