Fixed test cases for new app changes