Change test architecture