Still working on fixing effing travis tests