Updated Documentation, added some tests