Merge "Re-activate tests"