fixed bugs and removed jbm from tests