some tests added, admin models changed