Updated Test Controller