WIP on specs: still 23 failing tests