Added some implementation to make the tests pass.