Tests fixed
Doc updated