Minor fixes to acceptance tests.

End of line regexp. Step with leading underscore. Stripping of leading/trailing
whitespace done consistently.