Don't use assign now that it's deprecated
Test assignment in if, else and assign scopes
bugfix: Correctly handle else scopes, handle overrides inside assign scopes
Updated tests