Improved the tests we run to test more output variations and to work