fix bug in test
Merge branch 'master' into logan