Documentation + Fix tests