Refactoring and more tests
Refactoring some more
testing for assignment of strings to variables
more scenarios to test
removing duplication from the tests
introducing hamcrest matchers
operators delimiting token boundaries