Add tests for cases where Z is not preserved