Fix some of the failing tests