[Fixed] many more lair templates to pass new unit tests

Change-Id: I2c9146dc9ed6148131ccf388d694aa5c47edd4f9