finally fixed those *$%&) tests...