Moving output expectation for each test into each individual test file and removing expected.txt. ...

...Also cleaned up error messaging so that there is no output for each test unless there is an error