Wrote some new improved unit tests.