Add tests & small refactoring of recipedb#895

burov wants to merge 1 commit intoGoogleCloudPlatform:masterGoogleCloudPlatform/osconfig:masterfrom

burov:testingburov/osconfig:testingCopy head branch name to clipboard