Re-enable commented tests