Added a few tests, mainly around odd punctiuation. And the code to make them pass.