Complete all except extra tests