test on null and empty is complete. Need rework formatter