Backporting tests to 1.1, mainly to shut up travis about failures ;)