Improved message and test passing