add layout files, update tests