Updating tests and removing old extentions.