Fix test, add features