Fix several tests