Hotfix/tests for #33

Added some tests for pr #33