first version with test data support