Adjust tests to apps refactor