Refactor test name and some app structure