Added more test conditions to generator_apps