Fix test, fix style