Bug fix & Tests data