SFR 451237 - Markups
Move out test code to separate method and comment out
Update comment
Do an extra null check