Added functionnal tests