Reorganize
Finish hello-2 test