move a test into a spec; extract Layouts into a module