Forgot to checkin those changes due to parallel testing support in java dsl