More methods and Rspecs