[Test] Changed test to new logic