fixed features tests
Merge branch 'master' into mcarthur