Refactor brittle specs

#84