refactor, add test data, add load from jar