Adding specs and fixing all failled specs