Fix test, remove libextra