Unify errors under a parent class
Update specs, get to green