[Fixed] Many lair templates to pass unit tests