added tests, migrations, admin options