Handle whitespace more correctly. Skip comment tests for now, to
sensitive to whitespace differences.