Fix tests

Get tests green
Remove focus from all specs