Clean-up some tests