Added Tianyu's tests in an ad hoc way.