Updated tests for new output; all passing