Ported some old tests over.
Merge pull request #59 from pllim/port-old-tests

Ported some old tests over.