rework tests to respond shell comments