Adds test and code for skipping layouts