refactor junit api