fix some plugin dependency issues
remove util.Asserts, use hamcrest instead