refactoring..

test code refactoring