Restructured test client