Decouple api calls
Browser tests WIP