Unit-Tests for #100