Tests update

Zombie removed
Legacy tests removed