Added helper functions, added test data files