Added functional coverage / removed app template logic