Tests for issue #47
Tests for issues #48 and #49