Remove old pending specs
Refactor entry_spec