updated tests...