Improved test parsing, punctuation still needs to be implemented.