fixing all specs, adding new