LUN-1608: fix tests
Merge pull request #36 from pbs/LUN-1608-fix

LUN-1608: fix tests