Changed code in BMInterface to allow unit tests to run to completion