Changed test implementation