Add App and tests