Removed bug and added data files
Unit tests should work