re-add support for multi-valued attributes

Add tests to ensure re-add support for multi-valued attributes are working