[Fixed] Many lair templates to pass new unit test