Made tests more independent. Some items were only working before previous ones left...