ordering deprecated resources
fixing test_base tests