Split test into modules. Rename app