Added unit tests to bugreportz.
am: 59f5af0465

Change-Id: Ide9e2aaac99e7925ec968231b2ed03174fbb08ca