New bdii tests, should close #8 and #9