Fix implementation to meet test reqs