Corrected rspecs and defaults handling