Implmented two of the stubbed-out tests.