Fixed failing test after #152
Merge pull request #153 from khellang/various-fixes

Fixed failing test after PR #152