Some docs, added some more tests