Some clean up in tests