WIP: finalize the test1