Converted from an api centric view to static data. Fixed test cases to reflect the same