revision of -s function testing