Updated Test code