Updated headers

Change-Id: I77fec3c7c2b87762a174742feefbb39675367fdc
Fixed test failing by restoring defaults

Change-Id: Idc5610c55f56464d73253c77594d4424b2586c46