Adds the implementation
Fixes test