Merge "Moved tests which failed under Robolectric" into main