Refactor/cleanup RawResultsTest