LUN-687 -- fix tests due to forgotten comma + import deleted by mistake
Merge pull request #8 from pbs/LUN-687+

Merge unit test fixes