small code refine, make it simple
remove some coverage ignore (because we have functional tests to cover these now)