spec reorganization and fixes to collocation tests