commit reworked ScalaTokenizerTest and test files