Fixing specs, they were quite broken.