Working on getting more tests ready for 3.0