Fix problem where test functions overlap and cause travis to break