Merge "[Ravenwood] Move bivalent test into the "test" directory" into main