Changed to make test methods independent