test code refactoring
v0.7.0