Add tests to confirm fix