clean up LCB and add test