Begin to add output tests
Combine logic and output tests