Get testing up to speed

Just making them ready for the Testing => Master PR