S000: Adding new basic rooms and fixing metadata

Change-Id: If9d5ac9b81b02ede0d7d9d142562ff1bc84b7710