Added new extension methods and some tests.
Fixed test.