Add parse output and fix tests