Updated tests and new infos