completing and refactoring tests
personal revision