Fix unit tests failing after multiple runs
Merge pull request #20 from catturavideo/fix-tests

Fix unit tests failing after multiple runs