Refine test: execute and finish properly