[214cc0eb22] Add tests to make sure that this bug stays fixed.