Refactor tests for history pass