Increased test coverage, Travis config file fixes