Updated Tests to check for the updated keys, moved old keys to deprecated list