some exit, return and throw tests corrected (bug#1509)