Update to use com_foobar and expand tests