Modified tests again