Add testapp for injection
Restructure project