- Replaced the magic strings with extension methods that produce the same behavior as the string keys did. - Added tests to validate new extension methods. #1307