Improve Android tests.
Make sure the variant removal test will be the very last.