move static data to dynamic and create test fixtures