Add specs and make a small change according to PR feedback.