Made tests more robust
Running tests as well