upgrade xstyle and fix tests