Some fixes for some broken tests