Removing focus from spec
Including more specs