re-organize test