Remove unnecessary tests, small cookie fix