Should i remove this code and just test the 2-3-compatible subset?