Add Statistics tests
Updated Statistics tests
Fixed Merge Conflicts