reworded and reorganized assertions, Change #2828
shortened stub, fixed typo in assertion description, Change #2828