Almost done. Few tests turns red