Update test app and scaffolding template