Update API and implementation for runners.
Update test case to match expectations