Update to new matcher style in ScalaTest and use type safe config