Fixed some broken uni tests