remove debug message
refactor Test method