Changed client test hierarchy