Restore some tests