Merge "Revert "Add tests to verify aspect ratio updates""