Updated Unit tests

A few failing tests exists: todo : to resolve