Removed comment indicating the test was expected to fail
Using hamcrest matchers in tests
Added more tests and consolidated them into one class
If we see a match we set a boolean variable so the header can be added later on
Check boolean and if true add header in the proper place