warning text  improved and more tests added