Merge "Adding unittests for build"