Vector solution and test added