Cleaning tests again