[Fixed] many lair templates to pass new unit test