refactor test format