Add tests, if only to avoid the silly bug of the previous commit