Add changers and tests