Fix test
Merge pull request #618 from stianst/master

Fix test