Merge "Add tests to verify aspect ratio updates"