Cleanup some cruft in tests