Continue fixing broken tests

- Add convenient mkStringNoEndsIfEmpty extension method