Making testing nicer