Added back more tests after testing against mock data