Fiexed : unit tests not passing anymore