Moved tests forward for existing code and stubbed out future tests.