Removes hardcoded excluded params
Adds special treatment of Object class and unit test