Life time builder tests fix