refactors some specs