Fix of issue #47
Fixed failing unit tests because of #47
Unit tests for #47