Merge "Improve mod/runtimeapi code coverage"