data structure refactor & new test data