More testing goodness added