Changed testing strategy