fix a message
Fix tests but do not pass tests, TODO