refactored to advance_and_check tests