Fix Legacy unity tests (including 2 skips & 2 incomplete)