updated conditionals on messaging and think tests