Updated application layout
Created tests for application