Grouped the specs tests
Fixed Superfluous in-tag whitespace test
Handle \r\n as \n