Modernized test setup