Made unit tests a little more robust/cool.