Refactor test code #60