Making some tests a little more readable