if it's doing it earlier - my bad :p. Anyways, as soon as you make that one test work for both 2 and 3 I'm good with merging this.