refactor names fix references for oath tests