Created proper source data file; minor test refactor