As all tests now work - started to refactor. Created Delimiter classes