It looks like you've removed a bunch of test cases that should be in place... Let's clean these up as well! @Nan-Zhang can you work with Anbang to get these working properly?