Improve tests to work with protected_attributes