Updated the base template.
Updated the test case.