Removed some clutter from tests