Fixing most specs. WIP