Fixed tests that don't compile