Made test cases more isolated