Merge "Merged 2 tests dependent on each other"