Made tests os independent