Outputs updated + tests