more refactor tests