Fix several more tests