9 refactor tests