add back fixture defs removed by mistake

Detailed comments available in all commits...