Integration of Gregor's test setup