Fix tests, fix tropo cluttering global namespace