Fix several failing tests