Fix tests - down to only 6