Fixed up the main-spec, but they do not test or show errors just yet.