Fixed tests...again