remove deprecations related to singular / multiple attributes

Removes deprecations in all tests except controller tests