up to 84 percent coverage now

Change-Id: I4859027f1c1b1d780f76120d997f5c2c6ab1a0de