clean up the bitly token passing, extract method from test