[xnxx] Modernize
[jukebox] Modernize and add a test