revert added tests that Yilong says are unnecessary