Fiddling around with tests some more.