Added some implementation to tests