Add "output" property and fix tests