more fixes for offline controller testing