Fix specs to work when they are excuted individually