Fixing several tests for new expectation behavior