Removed some unnecessary code from tests