Edit output and tests
Add tests