restoration of existing tests