exit values more accurate for test.sh purposes, some comments changed, comment removed