Added more test stubs, extracting hits.