Refactor
Add ScalaTest