Made tests shorter