Improve some tests, and enable one which actually wasn't