Fixed remaining failing tests