Updated extension menthods and associated tests.