Updating tests, mostly to show Scala string literals