Fixed tests that failed