Getter Methods & Tests for Optional Values

Not sure if this is what you were going for but let me know.