fixing tests...