tests B5 and fixes