Updated doc, moved test package