Added Z tests