Cleanup tests and avoid false test fails related to travis environment vars.