Ported some old tests over.

Ported some old tests over.