Updated testing skeleton