Fix return type cast
Add yml for Application
Change test to use yaml corresponding file