Fixed failing tests around multi char delimiters and refactor string calculator