Fixed tests that were out of date