Updated Test Class