Add more variants
Add another variant, fix another
Remove test changes

Last changes in system.prop were test only.  Don't put here.