Changed testing schema