Updates to layouts and test spec