Update test suite; remove some cruft