Updates, still failing tests