Changed expectations in tests to match the slight functional changes