Adding test builder

Change-Id: Iff1c864b151c07cce3f0e4ad7bc950a837ebd40a