ignore new file
Refactor token obtainment
refactor, try to play nice with the amount of shit we're doing to get tokens
Minor fix
Fix the before-test bit
derp
Minor updates to test descriptions