Fix one test; cleanup