add todos and cleanup in jbm be test script