Merge "Add more Layout tests"