Add tests to bug in previous commit