Adding a Generic Extension and Tests.