Some changes to tests with mixed results