Updated extension methods.
Updated unit test.
Minor changes.