Modified tests...