Fixed tests again