Refactor and Added more specs