Added some test for public api