BayeTestData - further modifications