merged MOCHITEST and MOCHITEST_BC
removed commented out code