Refactor list spec