Inproving tests