Merge "JUnit additions for BRMS,API"