Feature #907 : fixing unit test errors