fix tests & convert