Correcting variable names/comments in demand tests.