Updated tests so they run on headless servers