Updated to reflect testing changes