test: cleanup variable naming