More work on tokeniser and unit tests