Update test suite and fix some broken tests