Added test + some more docs