Feature #907 : fixing unit tests