Added some tests
tests structured a little bit different