New unit test added for Z. Bug fixed getting both acceptance tests to pass.