Small bacon tests fixes / improvements