[Fixed] many lair templates to pass new unit tests

Change-Id: Icd711cb007884d9868c8d2506e668387256eb55e