Added Clint Wu's tests