Updating tests per PR