fix tests
Merge branch 'prefilter_optimisation'
Merge pull request #48 from andrewjpage/master

Fix tests