Test: Added unit tests, and also resolves bp2build error. Change-Id: I6e01d9e233ec21dbb244e5682cbeebbc3a1ac0c4