Fix remaning tests