Added more tests, updated BasicHeadlinesTest