Finished adding original tests.