travis fix, unittest fixes