Refactory tests (conventional mode)