Fixed tests
More obsolete TZ code removal