Refactor and adds empty test