Changed test stuff