Minor cleaning up in test