Data fetching works, first three tests passesd
Fix merge issues