Fixed test using Spring MVC Test framework
improved layout