Restructure specifications so that they all run.