added more tests and added functionality for dealing with punctuation and multiple operations