Coverage improved and travis compatibility problems fixed