Fixed to pass rake tests