Dev refactor

modify sug for test