Added some tests + docs