Added unit tests to bugreportz. am: 59f5af0465
am: bd99091117

Change-Id: I7bc8f1331d92bd540ea180a5d8a034f6dcff16da