Changed testing framework