Fix bctest, and add a workaround that should solve the problem with