Fix/bem make test

Attempt to fix sporadically failing tests