Initial pass at testing

--HG--
rename : 893670 => 893670-p1