Removed share(), fixed tests