Merge "Move test_extension and use base for non-admin"