Made tests universal