Clean test up a bit