issue $126 expand test and update code for it