fixes for online controller testing