Re-enable some tests