Addressed CR comments; fix code smells related to deprecated org.scalatest.matchers.MustMatchers