Updated tests
Made tests a bit better and fixed fetch bugs