Refactor specs and associated class. Add a new one to be implemented.