Fix a couple of tests and remove the tmp directory