Fix ensure_inclusion_of to support plain attrs

Also add missing tests to confirm this behavior.
Fix NonNullableBooleanError so it contains attribute name