code: refactored; test list: increased