Finished a simple version of the fix for AMBIGUOUS_SUPER + test cases