Update scalatest
Extract parsers and test