Fillters added and updated.
Merge remote-tracking branch 'origin/master'
Minor fix in model, some test filtering removed.