Adjust tests to refactor of apps