and fix the warning message and test should statement to reflect this new evaluation