refactor message tested