converting test fixtures to map syntax, and keeping old test syntax for back-compat tests