Added some new tests
Fixed #6 Added logs