Refactors some specs. Less bad now.