Cleanup of build.gradle and add DISPLAY=:99 for xvfb