Update tests round 2