#207 Added tests
Merge pull request #459 from krzyk/207

#459: pull request #207 Added tests