test fix
Merge pull request #1895 from andytaylor/master

test fix