Reverted Tango-related tests