first attempt at getting tests ready for different versions