Add tests to bug #1553 resolution